From: Ian Campbell <ian.campbell@citrix.com>
Date: Wed, 13 Oct 2010 10:37:02 +0000 (+0100)
Subject: xl: correct migration_domname_r
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~11405
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=bc712520fabbeb25ced993c57dd05bcf77aea758;p=xen.git

xl: correct migration_domname_r

22154:ed8019e672c6 causes migration_domname_r to be initialised as
d_config.c_info.name + "--incoming" immediately after setting
d_config.c_info.name. The intention appears to have been to set it to
common_domname + "--incoming" so do so.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
committer: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---

diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index 0fb65d5696..56d85287b3 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -1551,7 +1551,7 @@ static int create_domain(struct domain_create *dom_info)
             d_config.c_info.name = 0; /* steals allocation from config */
 
             if (asprintf(&d_config.c_info.name,
-                         "%s--incoming", d_config.c_info.name) < 0) {
+                         "%s--incoming", common_domname) < 0) {
                 fprintf(stderr, "Failed to allocate memory in asprintf\n");
                 exit(1);
             }